Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Feb 2012 15:32:43 +0000 (07:32 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Feb 2012 15:32:43 +0000 (07:32 -0800)

Trivial merge